From 99f5fe5580f67bb8fec56d719c3b03dcb08608c6 Mon Sep 17 00:00:00 2001
From: li_oxen <li_oxen@qq.com>
Date: Sat, 21 Mar 2020 12:20:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=20=E4=BF=AE=E6=AD=A3=20=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E5=A4=A7=E5=B0=8F=20=E4=BF=AE=E6=AD=A3=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=A5=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E8=AE=B0=E4=BD=8F=E7=9A=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E5=92=8C=E5=AF=86=E7=A0=81=20=E4=BF=AE=E6=AD=A3=20?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=88=A0=E9=99=A4=E5=90=8E=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=9A=E6=8F=90=E7=A4=BA=E5=B7=B2=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=20=E5=AE=8C=E5=96=84=20=E5=88=A0=E9=99=A4=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9=E4=B8=BA=20?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=20=E5=AE=8C=E5=96=84=20?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../main/resources/ehcache/ehcache-shiro.xml  | 15 +++++++-------
 .../src/main/resources/static/css/style.css   |  4 ----
 .../main/resources/static/ruoyi/js/ry-ui.js   | 10 ++++++++--
 .../src/main/resources/static/ruoyi/login.js  |  2 +-
 .../src/main/resources/templates/include.html |  1 +
 .../src/main/resources/templates/index.html   | 20 +++++++++----------
 .../resources/templates/system/dept/dept.html |  2 +-
 .../templates/system/dict/type/type.html      |  5 ++++-
 .../resources/templates/system/user/add.html  |  4 ++--
 .../ruoyi/common/constant/ShiroConstants.java |  8 ++++----
 .../common/utils/file/FileUploadUtils.java    |  2 +-
 .../ruoyi/common/utils/html/EscapeUtil.java   | 12 -----------
 .../framework/aspectj/DataScopeAspect.java    |  3 ++-
 .../interceptor/RepeatSubmitInterceptor.java  |  2 +-
 .../shiro/service/SysPasswordService.java     |  2 +-
 .../shiro/session/OnlineSessionDAO.java       |  4 ++--
 .../framework/web/service/ConfigService.java  |  2 +-
 .../main/resources/vm/html/list-tree.html.vm  |  8 ++++----
 .../src/main/resources/vm/html/list.html.vm   | 12 +++++------
 .../com/ruoyi/quartz/util/JobInvokeUtil.java  |  2 +-
 .../java/com/ruoyi/system/domain/SysRole.java |  1 +
 .../java/com/ruoyi/system/domain/SysUser.java |  1 +
 .../service/impl/SysUserServiceImpl.java      |  2 +-
 .../resources/mapper/system/SysDeptMapper.xml |  5 +++--
 .../resources/mapper/system/SysMenuMapper.xml |  4 ++--
 .../resources/mapper/system/SysUserMapper.xml | 14 ++++++-------
 27 files changed, 74 insertions(+), 75 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1215ce5d3..288014163 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
 				<version>${shiro.version}</version>
 			</dependency>
 			
-			<!-- Shiro使用Srping框架 -->
+			<!-- Shiro使用Spring框架 -->
 			<dependency>
 				<groupId>org.apache.shiro</groupId>
 				<artifactId>shiro-spring</artifactId>
diff --git a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
index 72469e13a..20ac1121b 100644
--- a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
+++ b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml
@@ -4,14 +4,15 @@
     <!-- 磁盘缓存位置 -->
     <diskStore path="java.io.tmpdir"/>
     
-    <!-- maxEntriesLocalHeap:堆内存中最大缓存对象数，0没有限制 -->
-    <!-- maxElementsInMemory： 在内存中缓存的element的最大数目。-->
-    <!-- eternal:elements是否永久有效，如果为true，timeouts将被忽略，element将永不过期 -->
-    <!-- timeToIdleSeconds:失效前的空闲秒数，当eternal为false时，这个属性才有效，0为不限制 -->
-    <!-- timeToLiveSeconds:失效前的存活秒数，创建时间到失效时间的间隔为存活时间，当eternal为false时，这个属性才有效，0为不限制 -->
-    <!-- overflowToDisk： 如果内存中数据超过内存限制，是否要缓存到磁盘上 -->
+    <!-- maxEntriesLocalHeap: 堆内存中最大缓存对象数，0没有限制 -->
+    <!-- maxElementsInMemory：在内存中缓存的element的最大数目。-->
+    <!-- eternal: elements是否永久有效，如果为true，timeouts将被忽略，element将永不过期 -->
+    <!-- timeToIdleSeconds: 失效前的空闲秒数，当eternal为false时，这个属性才有效，0为不限制 -->
+    <!-- timeToLiveSeconds: 失效前的存活秒数，创建时间到失效时间的间隔为存活时间，当eternal为false时，这个属性才有效，0为不限制 -->
+    <!-- overflowToDisk：如果内存中数据超过内存限制，是否要缓存到磁盘上 -->
     <!-- statistics：是否收集统计信息。如果需要监控缓存使用情况，应该打开这个选项。默认为关闭（统计会影响性能）。设置statistics="true"开启统计 -->
-    
+    <!-- diskPersistent：是否持久化磁盘缓存,当这个属性的值为true时,系统在初始化时会在磁盘中查找文件名为cache名称,后缀名为data的文件。指重启jvm后，数据是否有效。默认为false -->
+
     <!-- 默认缓存 -->
     <defaultCache
             maxEntriesLocalHeap="1000"
diff --git a/ruoyi-admin/src/main/resources/static/css/style.css b/ruoyi-admin/src/main/resources/static/css/style.css
index e5d445ce1..fcf151c5b 100644
--- a/ruoyi-admin/src/main/resources/static/css/style.css
+++ b/ruoyi-admin/src/main/resources/static/css/style.css
@@ -3083,10 +3083,6 @@ a:hover, a:focus {
     margin-bottom: 15px;
 }
 
-video {
-    width: 100% !important;
-    height: auto !important;
-}
 /* GALLERY */
 .gallery>.row>div {
     margin-bottom: 15px;
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index ed1376ca2..b80d84d32 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -215,9 +215,15 @@ var table = {
             	$(optionsIds).off("click").on("click", '.img-circle', function() {
     			    var src = $(this).attr('src');
     			    var target = $(this).data('target');
-    			    var height = $(this).data('height');
-    			    var width = $(this).data('width');
     			    if($.common.equals("self", target)) {
+    						var height = $(this).data('height');
+    						var width = $(this).data('width');
+    						//如果是移动端，就使用自适应大小弹窗
+    						if ($.common.isMobile()) {
+    							width = 'auto';
+    							height = 'auto';
+    						}
+
     			    	layer.open({
         			        title: false,
         			        type: 1,
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/login.js b/ruoyi-admin/src/main/resources/static/ruoyi/login.js
index f633f51de..4acf33810 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/login.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/login.js
@@ -26,7 +26,7 @@ function login() {
         data: {
             "username": username,
             "password": password,
-            "validateCode" : validateCode,
+            "validateCode": validateCode,
             "rememberMe": rememberMe
         },
         success: function(r) {
diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html
index c67f0b7f5..733acd174 100644
--- a/ruoyi-admin/src/main/resources/templates/include.html
+++ b/ruoyi-admin/src/main/resources/templates/include.html
@@ -2,6 +2,7 @@
 <head th:fragment=header(title)>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="keywords" content="">
 	<meta name="description" content="">
 	<title th:text="${title}"></title>
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 64b70b6f8..e61f0726c 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -5,9 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
     <title>若依系统首页</title>
-    <!--[if lt IE 9]>
-    <meta http-equiv="refresh" content="0;ie.html"/>
-    <![endif]-->
+    <!-- 避免IE使用兼容模式 -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link th:href="@{favicon.ico}" rel="stylesheet"/>
     <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
@@ -34,7 +33,7 @@
             <ul class="nav" id="side-menu">
             	<li>
             		<div class="user-panel">
-            			<a class="menuItem" title="个人中心" th:href="@{/system/user/profile}"> 
+            			<a class="menuItem" title="个人中心" th:href="@{/system/user/profile}">
             				<div class="hide" th:text="个人中心"></div>
 					        <div class="pull-left image">
 		                    	<img th:src="(${user.avatar} == '') ? @{/img/profile.jpg} : @{${user.avatar}}" class="img-circle" alt="User Image">
@@ -56,7 +55,7 @@
                 <li th:each="menu : ${menus}">
                 	<a th:class="@{${menu.url != '' && menu.url != '#'} ? ${menu.target}}" th:href="@{${menu.url == ''} ? |#| : ${menu.url}}">
                 		<i class="fa fa-bar-chart-o" th:class="${menu.icon}"></i>
-                    	<span class="nav-label" th:text="${menu.menuName}">一级菜单</span> 
+                    	<span class="nav-label" th:text="${menu.menuName}">一级菜单</span>
                     	<span th:class="${menu.url == '' || menu.url == '#'} ? |fa arrow|"></span>
                 	</a>
                     <ul class="nav nav-second-level collapse">
@@ -276,14 +275,15 @@ function resetPwd() {
     var url = ctx + 'system/user/profile/resetPwd';
     $.modal.open("重置密码", url, '770', '380');
 }
+
 /* 切换主题 */
 function switchSkin() {
     layer.open({
-		type : 2,
-		shadeClose : true,
-		title : "切换主题",
-		area : ["530px", "386px"],
-		content : [ctx + "system/switchSkin", 'no']
+		type: 2,
+		shadeClose: true,
+		title: "切换主题",
+		area: ["530px", "386px"],
+		content: [ctx + "system/switchSkin", 'no']
 	})
 }
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/dept/dept.html b/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
index 6663d1848..c49a964eb 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
@@ -27,7 +27,7 @@
 					</div>
 				</form>
 			</div>
-                
+            
             <div class="btn-group-sm" id="toolbar" role="group">
 		        <a class="btn btn-success" onclick="$.operate.add(100)" shiro:hasPermission="system:dept:add">
                     <i class="fa fa-plus"></i> 新增
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html b/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html
index 8b63b2ad7..978e72f2e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html
@@ -108,7 +108,10 @@
 		        },
 		        {
 		            field: 'remark',
-		            title: '备注'
+		            title: '备注',
+					formatter: function(value, row, index) {
+						return $.table.tooltip(value);
+					}
 		        },
 		        {
 		            field: 'createTime',
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html
index 5025eec94..ceaebeb49 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -14,7 +14,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">用户名称：</label>
                         <div class="col-sm-8">
-                            <input name="userName" placeholder="请输入用户名称" class="form-control" type="text" maxlength="30" required>
+                            <input name="userName" placeholder="请输入用户名称" class="form-control" type="text" maxlength="30" autocomplete="new-password" required>
                         </div>
                     </div>
                 </div>
@@ -61,7 +61,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">登录密码：</label>
                         <div class="col-sm-8">
-                            <input name="password" placeholder="请输入登录密码" class="form-control" type="password" th:value="${@config.getKey('sys.user.initPassword')}" required>
+                            <input name="password" placeholder="请输入登录密码" class="form-control" type="password" th:value="${@config.getKey('sys.user.initPassword')}" autocomplete="new-password" required>
                         </div>
                     </div>
                 </div>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
index c5027c240..638d29b1f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
@@ -20,22 +20,22 @@ public interface ShiroConstants
     /**
      * 消息key
      */
-    public static String MESSAGE = "message";
+    public static final String MESSAGE = "message";
 
     /**
      * 错误key
      */
-    public static String ERROR = "errorMsg";
+    public static final String ERROR = "errorMsg";
 
     /**
      * 编码格式
      */
-    public static String ENCODING = "UTF-8";
+    public static final String ENCODING = "UTF-8";
 
     /**
      * 当前在线会话
      */
-    public String ONLINE_SESSION = "online_session";
+    public static final String ONLINE_SESSION = "online_session";
 
     /**
      * 验证码key
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index 1503e1559..2aab832a4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -91,7 +91,7 @@ public class FileUploadUtils
      *
      * @param baseDir 相对应用的基目录
      * @param file 上传的文件
-     * @param extension 上传文件类型
+     * @param allowedExtension 上传文件类型
      * @return 返回上传成功的文件名
      * @throws FileSizeLimitExceededException 如果超出最大大小
      * @throws FileNameLengthLimitExceededException 文件名太长
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
index 5a4cf0c8f..e150f84cc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
@@ -9,8 +9,6 @@ import com.ruoyi.common.utils.StringUtils;
  */
 public class EscapeUtil
 {
-    public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)";
-
     private static final char[][] TEXT = new char[64][];
 
     static
@@ -141,14 +139,4 @@ public class EscapeUtil
         }
         return tmp.toString();
     }
-
-    public static void main(String[] args)
-    {
-        String html = "<script>alert(1);</script>";
-        // String html = "<scr<script>ipt>alert(\"XSS\")</scr<script>ipt>";
-        // String html = "<123";
-        System.out.println(EscapeUtil.clean(html));
-        System.out.println(EscapeUtil.escape(html));
-        System.out.println(EscapeUtil.unescape(html));
-    }
 }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index 9fa9b0afb..ca9d2ae33 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -92,7 +92,8 @@ public class DataScopeAspect
      * 
      * @param joinPoint 切点
      * @param user 用户
-     * @param alias 别名
+     * @param deptAlias 别名
+     * @param userAlias 别名
      */
     public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
     {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
index a84e8ac7a..35076b595 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
@@ -47,7 +47,7 @@ public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
     /**
      * 验证是否重复提交由子类实现具体的防重复提交的规则
      * 
-     * @param httpServletRequest
+     * @param request
      * @return
      * @throws Exception
      */
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
index 3ff8f92ab..b9b8fadb0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java
@@ -80,7 +80,7 @@ public class SysPasswordService
 
     public String encryptPassword(String username, String password, String salt)
     {
-        return new Md5Hash(username + password + salt).toHex().toString();
+        return new Md5Hash(username + password + salt).toHex();
     }
 
     public void unlock(String loginName){
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java
index 40ff31277..bbcf1e342 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionDAO.java
@@ -80,12 +80,12 @@ public class OnlineSessionDAO extends EnterpriseCacheSessionDAO
             boolean isGuest = onlineSession.getUserId() == null || onlineSession.getUserId() == 0L;
 
             // session 数据变更了 同步
-            if (isGuest == false && onlineSession.isAttributeChanged())
+            if (!isGuest && onlineSession.isAttributeChanged())
             {
                 needSync = true;
             }
 
-            if (needSync == false)
+            if (!needSync)
             {
                 return;
             }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/ConfigService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/ConfigService.java
index 5ee1b3d8c..a4da588ad 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/ConfigService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/ConfigService.java
@@ -18,7 +18,7 @@ public class ConfigService
     /**
      * 根据键名查询参数配置信息
      * 
-     * @param configName 参数名称
+     * @param configKey 参数名称
      * @return 参数键值
      */
     public String getKey(String configKey)
diff --git a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
index 764b868f5..e75fdb67c 100644
--- a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
@@ -115,8 +115,8 @@
 #if($column.pk)
 #elseif($column.list && "" != $dictType)
                 {
-                    field : '${javaField}', 
-                    title : '${comment}',
+                    field: '${javaField}',
+                    title: '${comment}',
                     align: 'left',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(${javaField}Datas, value);
@@ -124,8 +124,8 @@
                 },
 #elseif($column.list && "" != $javaField)
                 {
-                    field : '${javaField}', 
-                    title : '${comment}',
+                    field: '${javaField}',
+                    title: '${comment}',
                     align: 'left'
                 },
 #end                
diff --git a/ruoyi-generator/src/main/resources/vm/html/list.html.vm b/ruoyi-generator/src/main/resources/vm/html/list.html.vm
index 2d251424a..8a9fddfb5 100644
--- a/ruoyi-generator/src/main/resources/vm/html/list.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/list.html.vm
@@ -111,22 +111,22 @@
 #end
 #if($column.pk)
                 {
-                    field : '${javaField}', 
-                    title : '${comment}',
+                    field: '${javaField}',
+                    title: '${comment}',
                     visible: false
                 },
 #elseif($column.list && "" != $dictType)
                 {
-                    field : '${javaField}', 
-                    title : '${comment}',
+                    field: '${javaField}',
+                    title: '${comment}',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(${javaField}Datas, value);
                     }
                 },
 #elseif($column.list && "" != $javaField)
                 {
-                    field : '${javaField}', 
-                    title : '${comment}'
+                    field: '${javaField}',
+                    title: '${comment}'
                 },
 #end                
 #end
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
index 5519c672f..573aa6148 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
@@ -65,7 +65,7 @@ public class JobInvokeUtil
     /**
      * 校验是否为为class包名
      * 
-     * @param str 名称
+     * @param invokeTarget 名称
      * @return true是 false否
      */
     public static boolean isValidClassName(String invokeTarget)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java
index bb3f549e3..6916da060 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java
@@ -177,6 +177,7 @@ public class SysRole extends BaseEntity
         this.deptIds = deptIds;
     }
 
+	@Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("roleId", getRoleId())
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
index 43994ef36..701bae1e9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
@@ -346,6 +346,7 @@ public class SysUser extends BaseEntity
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .append("dept", getDept())
+            .append("roles", getRoles())
             .toString();
     }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 29ade1579..360d788e0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -307,7 +307,7 @@ public class SysUserServiceImpl implements ISysUserService
     }
 
     /**
-     * 校验用户名称是否唯一
+     * 校验手机号是否唯一
      *
      * @param user 用户信息
      * @return
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 02a1017c5..2894693cc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 	
 	<sql id="selectDeptVo">
-        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time 
+        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
         from sys_dept d
     </sql>
     
@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="status != null and status != ''">
 			AND status = #{status}
 		</if>
+
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		order by d.parent_id, d.order_num
@@ -65,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="checkDeptNameUnique" resultMap="SysDeptResult">
 	    <include refid="selectDeptVo"/>
-		where dept_name=#{deptName} and parent_id = #{parentId}
+		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0'
 	</select>
 
 	<select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 47f9b8376..0872cacb6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -131,13 +131,13 @@
 			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
 			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
 			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
-			<if test="url != null and url != ''">url = #{url},</if>
+			<if test="url != null">url = #{url},</if>
 			<if test="target != null and target != ''">target = #{target},</if>
 			<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
 			<if test="visible != null">visible = #{visible},</if>
 			<if test="perms !=null">perms = #{perms},</if>
 			<if test="icon !=null and icon != ''">icon = #{icon},</if>
-			<if test="remark != null and remark != ''">remark = #{remark},</if>
+			<if test="remark != null">remark = #{remark},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
 			update_time = sysdate()
 		</set>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index d32e2f6bf..4b2e916ea 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -119,29 +119,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectUserByLoginName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
-		where u.login_name = #{userName}
+		where u.login_name = #{userName} and u.del_flag = '0'
 	</select>
 	
 	<select id="selectUserByPhoneNumber" parameterType="String" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
-		where u.phonenumber = #{phonenumber}
+		where u.phonenumber = #{phonenumber} and u.del_flag = '0'
 	</select>
 	
 	<select id="selectUserByEmail" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
-		where u.email = #{email}
+		where u.email = #{email} and u.del_flag = '0'
 	</select>
 	
 	<select id="checkLoginNameUnique" parameterType="String" resultType="int">
-		select count(1) from sys_user where login_name=#{loginName}
+		select count(1) from sys_user where login_name=#{loginName} and del_flag = '0'
 	</select>
 	
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, phonenumber from sys_user where phonenumber=#{phonenumber}
+		select user_id, phonenumber from sys_user where phonenumber=#{phonenumber} and del_flag = '0'
 	</select>
 	
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
-		select user_id, email from sys_user where email=#{email}
+		select user_id, email from sys_user where email=#{email} and del_flag = '0'
 	</select>
 	
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<delete id="deleteUserById" parameterType="Long">
- 		delete from sys_user where user_id = #{userId}
+ 		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>
  	
  	<delete id="deleteUserByIds" parameterType="Long">

From afbd8331d72d9d97d3658ca480222e08bff4fc0e Mon Sep 17 00:00:00 2001
From: li_oxen <li_oxen@qq.com>
Date: Sat, 21 Mar 2020 20:16:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/ruoyi/index.js     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/index.js b/ruoyi-admin/src/main/resources/static/ruoyi/index.js
index 2ae799da7..e74db446c 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/index.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/index.js
@@ -14,13 +14,11 @@ $(function() {
     $('#side-menu').metisMenu();
 
     //固定菜单栏
-    $(function() {
-        $('.sidebar-collapse').slimScroll({
-            height: '100%',
-            railOpacity: 0.9,
-            alwaysVisible: false
-        });
-    });
+	$('.sidebar-collapse').slimScroll({
+		height: '96%',
+		railOpacity: 0.9,
+		alwaysVisible: false
+	});    
 
     // 菜单切换
     $('.navbar-minimalize').click(function() {
@@ -35,9 +33,9 @@ $(function() {
     $('#side-menu>li').click(function() {
     	if ($('body').hasClass('canvas-menu mini-navbar')) {
             NavToggle();
-        }
-    	
+        }    	
     });
+	
     $('#side-menu>li li a:not(:has(span))').click(function() {
         if ($(window).width() < 769) {
             NavToggle();