支持Druid监控

src/main/java/com/ruoyi/framework/config/DruidDBConfig.java

@@ -14,7 +14,7 @@ import com.alibaba.druid.support.http.WebStatFilter;
 import lombok.extern.slf4j.Slf4j;
 
 /**
- * 数据库信息配置加载
+ * Druid数据库信息配置加载
  * 
  * @author yangzz
  */
@@ -119,12 +119,8 @@ public class DruidDBConfig
         ServletRegistrationBean reg = new ServletRegistrationBean();
         reg.setServlet(new StatViewServlet());
         // 白名单
-        reg.addUrlMappings("/druid/*");
+        reg.addUrlMappings("/monitor/druid/*");
         reg.addInitParameter("allow", "");
-        // 黑名单
-        // reg.addInitParameter("deny","");
-        // reg.addInitParameter("loginUsername", "admin");
-        // reg.addInitParameter("loginPassword", "admin");
         return reg;
     }
 
@@ -134,7 +130,7 @@ public class DruidDBConfig
         FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
         filterRegistrationBean.setFilter(new WebStatFilter());
         filterRegistrationBean.addUrlPatterns("/*");
-        filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
+        filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/monitor/druid/*");
         filterRegistrationBean.addInitParameter("profileEnable", "true");
         filterRegistrationBean.addInitParameter("principalCookieName", "USER_COOKIE");
         filterRegistrationBean.addInitParameter("principalSessionName", "USER_SESSION");

src/main/java/com/ruoyi/project/system/role/domain/Role.java

@@ -14,6 +14,8 @@ public class Role
     private Long roleId;
     // 角色名
     private String roleName;
+    // 角色权限
+    private String roleKey;
     // 角色状态:0正常,1禁用
     private String status;
     // 创建时间

src/main/resources/application-druid.yml

@@ -7,10 +7,11 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    #url: jdbc:mysql://10.213.24.45:3306/ry?useUnicode=true&characterEncoding=utf8
+    url: jdbc:mysql://10.213.24.45:3306/ry?useUnicode=true&characterEncoding=utf8
-    url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8
+    #url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8
     username: root
     password: password
+    # 初始化大小，最小，最大
     initialSize: 1
     minIdle: 3
     maxActive: 20

src/main/resources/mybatis/system/SystemRoleMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<resultMap type="Role" id="RoleResult">
 		<id     property="roleId"       column="role_id"        />
 		<result property="roleName"     column="role_name"      />
+		<result property="roleKey"      column="role_key"      />
 		<result property="status"       column="status"         />
 		<result property="createTime"   column="create_time"    />
 		<result property="updateTime"   column="update_time"    />

src/main/resources/static/js/appjs/monitor/online/online.js

@@ -26,8 +26,8 @@ function load() {
 						pageNumber : 1, // 如果设置了分布，首页页码
 						// search : true, // 是否显示搜索框
 						showColumns : false, // 是否显示内容下拉框（选择显示的列）
-						sidePagination : "client", // 设置在哪里进行分页，可选值为"client" 或者
+						sidePagination : "client", // 设置在哪里进行分页，可选值为"client" 或者 "server"
-						// "server"
+						cache : false,
 						queryParams : function(params) {
 							return {
 								// 说明：传入后台的参数包括offset开始索引，limit步长，sort排序列，order：desc或者,以及所有列的键值对
@@ -58,10 +58,6 @@ function load() {
 									field : 'deptName',
 									title : '部门名称'
 								},
-								{
-									field : 'roleName',
-									title : '角色名称'
-								},
 								{
 									field : 'ipaddr',
 									title : '主机'